{non-gerrit}/qt-labs/widgets-ng.git/tests/auto/qhostinfo, branch master

Merge commit 'qt/master'

2009-08-20T14:58:58+00:00

Conflicts:
	examples/painting/svgviewer/files/bubbles.svg
	src/corelib/kernel/qobject.cpp
	src/network/kernel/qhostinfo.cpp
	tests/auto/qhostinfo/tst_qhostinfo.cpp

Fix literal IPv6 hostname resolution in QHostInfo.

2009-08-20T10:36:50+00:00

With the series of commits ending in ff1280178, I made QUrl::toAce
fail if the parameter is not a well-formed hostname (i.e., if it
violates STD3). IPv6 hostnames do, so we can't preemptively run
ToACE.

Instead, delay running ToACE until we've tried literal matching.

Reviewed-by: TrustMe

We can use runs = 100 in the test case.

2009-08-20T07:43:07+00:00

On Symbian platform it will take longer time.

Had to change ip and hostname as, at the time,

2009-08-14T08:03:24+00:00

this was only accessible from Nokia network.

Merge commit 'qt/master'

2009-08-13T08:27:51+00:00

Conflicts:
	examples/opengl/samplebuffers/glwidget.cpp
	src/corelib/io/qfsfileengine_unix.cpp
	src/corelib/kernel/qobject.cpp
	src/corelib/tools/qsharedpointer.cpp
	src/gui/gui.pro
	tests/auto/qhttp/tst_qhttp.cpp
	tests/auto/qkeyevent/tst_qkeyevent.cpp

Fixed QtNetwork autotest build breaks for Symbian.

2009-08-12T08:48:28+00:00

Also updated QtNetwork auto test category file.

Update obsolete URL's in code and docs.

2009-08-12T06:09:25+00:00

Reviewed-by: Trust Me

Update contact URL in license headers.

2009-08-12T03:21:45+00:00

Reviewed-by: Trust Me

Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public

2009-08-11T06:11:20+00:00

Unified QtNetworkSettings:severIP return type for all platforms.

2009-08-11T06:06:36+00:00

This commit fixes the following autotest case build breaks on
windows when compiling QtS60 sources:
    - q3socket
    - q3socketdevice
    - qhostinfo
    - qsocks5socketengine